[ACM] An environment where ACM and its tools have not been installed before

will throw an error during 'make' of the test suite. This fixes the problem.

Signed-off-by: Stefan Berger <stefanb@us.ibm.com>

diff --git a/tools/xm-test/tests/security-acm/01_security-acm_basic.py b/tools/xm-test/tests/security-acm/01_security-acm_basic.py
index 569b004c1880fafa846bc005480d316ce9056b81..6459bb9fd875b3b95cc36d68088920a5a920e6da 100644 (file)
--- a/tools/xm-test/tests/security-acm/01_security-acm_basic.py
+++ b/tools/xm-test/tests/security-acm/01_security-acm_basic.py
@@ -24,6 +24,9 @@ testlabel = "blue"
 vmconfigfile = "/tmp/xm-test.conf"
 testresource = "phy:ram0"
 
+if not isACMEnabled():
+    SKIP("Not running this test since ACM not enabled.")
+
 status, output = traceCommand("xm makepolicy %s" % (testpolicy))
 if status != 0 or output != "":
     FAIL("'xm makepolicy' failed with status %d and output\n%s" %

diff --git a/tools/xm-test/tests/security-acm/Makefile.am b/tools/xm-test/tests/security-acm/Makefile.am
index b2979b842a0df0d9a810dff86361943cb72cb7b4..7b691712f212f23bb7f3f51ec075909e1aaae964 100644 (file)
--- a/tools/xm-test/tests/security-acm/Makefile.am
+++ b/tools/xm-test/tests/security-acm/Makefile.am
@@ -15,7 +15,10 @@ TESTS_ENVIRONMENT=@TENV@
 %.test: %.py
        cp $< $@
        chmod +x $@
-       @cp -f xm-test-security_policy.xml /etc/xen/acm-security/policies
+       @if [ -d /etc/xen/acm-security/policies ]; then \
+               cp -f xm-test-security_policy.xml      \
+                     /etc/xen/acm-security/policies;  \
+       fi;
 
 clean-local: am_config_clean-local